Skip to content

Refactor/consolidate data files#119

Merged
andytorrestb merged 4 commits into
plume-kit:masterfrom
andytorrestb:refactor/consolidate_data_files
Jul 14, 2026
Merged

Refactor/consolidate data files#119
andytorrestb merged 4 commits into
plume-kit:masterfrom
andytorrestb:refactor/consolidate_data_files

Conversation

@andytorrestb

Copy link
Copy Markdown
Member

No description provided.

andytorrestb and others added 4 commits July 13, 2026 19:26
Case assets (STL, JFH, TCD, flight plan files) can now live in a
repo-level data/ directory instead of being copied into every case.
resolve_asset_path() checks the case-local folder first, so
case-specific files keep priority, then falls back to the shared
data/<subdir>/ folder. All pyrpod loaders now resolve config-referenced
files through it. JFH output paths intentionally stay case-local.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Every case carried its own copies of shared STL, TCD, JFH, and flight
plan files. One canonical copy of each is kept under data/stl, data/tcd,
data/jfh, and data/flight_plan; all byte-identical copies are deleted
(verified by content hash before removal).

Files whose shared name was already taken by different content, or that
existed under several case-specific names, were given descriptive
canonical names instead:

- tcf_16_thrusters.txt, tcf_4_thrusters.txt, tcf_1_thruster.txt,
  tcf_24_thrusters.txt (previously tcf_<case_name>.txt / tcf.txt)
- cylinder_low_res.stl (raw source of cylinder_transformed.stl;
  data/stl/cylinder.stl is a different high-res mesh)
- mold_funnel_high_res.stl / mold_funnel_high_res_transformed.stl
  (2880-tri funnel; the 208-tri variant keeps the plain name)
- square_plate_large_fine.stl (was also square_plate_large.stl)

Also removes orphaned duplicates: tests/JFH05.A (identical to
data/jfh/JFH05.A, referenced nowhere) and data/tcd/TCD2.txt (identical
to tcf_flight_envelopes.txt).

Files with the same name but genuinely different content stay
case-local; the local-first resolver guarantees they win over data/.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
config.ini tcf/jfh/stl_thruster keys now reference the canonical names
in data/ (tcf_16_thrusters.txt, tcf_1_thruster.txt, jfh_base_case.A,
mold_funnel_high_res_transformed.stl, ...). Transform scripts read
their base STL from data/stl via the repo root; transformed outputs are
still written case-locally, where the local-first resolver picks them
up. Updates a stale comment pointing at the removed data/tcd/TCD2.txt.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
tdf.csv and ccf.txt hold thruster performance data and cluster
placement for a specific case run and are expected to be tuned per
case, so they are excluded from the shared data/ consolidation.
Restores every case-local tdf.csv, ccf.txt, and tdf_legend.csv exactly
as on master, restores data/tcd/tdf.csv to its pre-consolidation
content, and drops the consolidated data/tcd copies of ccf.txt and
tdf_legend.csv.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@andytorrestb andytorrestb merged commit 5c34956 into plume-kit:master Jul 14, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant